From c421252d5a1862227b2360cfe4185918105fe0ce Mon Sep 17 00:00:00 2001
From: "chris@kneesaa.uk.xensource.com" <chris@kneesaa.uk.xensource.com>
Date: Thu, 3 Aug 2006 19:45:14 +0100
Subject: [PATCH] [blktap] Add dependencies to Makefiles and simplify to avoid
 needless rebuilds.

Signed-off-by: Christian Limpach <Christian.Limpach@xensource.com>
---
 tools/blktap/drivers/Makefile | 15 ++++++---------
 tools/blktap/lib/Makefile     | 14 +++++++++-----
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/tools/blktap/drivers/Makefile b/tools/blktap/drivers/Makefile
index 6601a4d005..a2bdd02259 100644
--- a/tools/blktap/drivers/Makefile
+++ b/tools/blktap/drivers/Makefile
@@ -49,21 +49,18 @@ all: $(IBIN) qcow-util
 LINUX_ROOT := $(wildcard $(XEN_ROOT)/linux-2.6.*-xen-sparse)
 
 
-blktapctrl: 
+blktapctrl: blktapctrl.c
 	$(CC) $(CFLAGS) -o blktapctrl $(LIBS) blktapctrl.c
 
-tapdisk: $(BLK-OBJS)
+tapdisk: $(BLK-OBJS) tapdisk.c
 	$(CC) $(CFLAGS) -o tapdisk $(BLK-OBJS) tapdisk.c \
 		$(AIOLIBS) $(LIBS)
 
+.PHONY: qcow-util
+qcow-util: img2qcow qcow2raw qcow-create
 
-qcow-util: $(BLK-OBJS)
-	$(CC) $(CFLAGS) -o img2qcow $(BLK-OBJS) img2qcow.c \
-		$(AIOLIBS)  $(LIBS)
-	$(CC) $(CFLAGS) -o qcow2raw $(BLK-OBJS) qcow2raw.c  \
-		$(AIOLIBS)  $(LIBS)
-	$(CC) $(CFLAGS) -o qcow-create $(BLK-OBJS) qcow-create.c  \
-		$(AIOLIBS)  $(LIBS)
+img2qcow qcow2raw qcow-create: %: $(BLK-OBJS)
+	$(CC) $(CFLAGS) -o $* $(BLK-OBJS) $*.c $(AIOLIBS)  $(LIBS)
 
 install: all
 	$(INSTALL_PROG) $(IBIN) $(QCOW_UTIL) $(DESTDIR)$(INSTALL_DIR)
diff --git a/tools/blktap/lib/Makefile b/tools/blktap/lib/Makefile
index 2d5b98e41a..9417b976ac 100644
--- a/tools/blktap/lib/Makefile
+++ b/tools/blktap/lib/Makefile
@@ -35,10 +35,14 @@ IBINS   :=
 
 LIB      = libblktap.a libblktap.so.$(MAJOR).$(MINOR)
 
+.PHONY: all
 all: build
 
-build:
-	$(MAKE) libblktap
+.PHONY: build
+build: libblktap.a
+
+.PHONY: libblktap
+libblktap: libblktap.a
 
 install: all
 	$(INSTALL_DIR) -p $(DESTDIR)/usr/$(LIBDIR)
@@ -51,13 +55,13 @@ install: all
 clean:
 	rm -rf *.a *.so* *.o *.rpm $(LIB) *~ $(DEPS) xen TAGS
 
-libblktap: $(OBJS) 
+libblktap.a: $(OBJS) 
 	$(CC) $(CFLAGS) -Wl,-soname -Wl,$(SONAME) -shared         \
 	      -L$(XEN_XENSTORE) -l xenstore                       \
 	      -o libblktap.so.$(MAJOR).$(MINOR) $^ $(LIBS)
 	ln -sf libblktap.so.$(MAJOR).$(MINOR) libblktap.so.$(MAJOR)
-	ln -sf libblktap.so.$(MAJOR) $@.so
-	ar rc libblktap.a $@.so
+	ln -sf libblktap.so.$(MAJOR) libblktap.so
+	ar rc $@ libblktap.so
 
 .PHONY: TAGS all build clean install libblktap
 
-- 
2.30.2